<<<<<<< HEAD
<template>
<<<<<<< HEAD
  <div class="home">    
    <HomeNavbar></HomeNavbar>
    <HomeInput></HomeInput>
    <TopPlaylistNew></TopPlaylistNew>
    <NewSong></NewSong>
    <HomeTabbar></HomeTabbar>
    <div style="padding-bottom: 15%;"></div>
=======
  <div class="home">
<<<<<<< HEAD
    <HomeNavbar></HomeNavbar>
    <HomeInput></HomeInput>
    <Radio></Radio>
    <TopPlaylistNew></TopPlaylistNew>
    <NewSong></NewSong>
    <HomeTabbar></HomeTabbar>
    <div style="padding-bottom: 15%"></div>
=======
    <HomeSinger />
>>>>>>> upstream/master
>>>>>>> upstream/master
  </div>
</template>

<script>
// @ is an alias to /src
<<<<<<< HEAD
import TopPlaylistNew from "@/components/home/TopPlaylistNew.vue";
import NewSong from "@/components/home/NewSong.vue";
import HomeInput from "@/components/home/HomeInput.vue";
import HomeTabbar from "@/components/home/HomeTabbar.vue";
import HomeNavbar from "@/components/home/HomeNavbar.vue";
import Radio from "@/components/radioStation/radioStation.vue";
=======
<<<<<<< HEAD
import TopPlaylistNew from '@/components/home/TopPlaylistNew.vue';
import NewSong from '@/components/home/NewSong.vue'
import HomeInput from '@/components/home/HomeInput.vue'
import HomeTabbar from '@/components/home/HomeTabbar.vue'
import HomeNavbar from '@/components/home/HomeNavbar.vue'
>>>>>>> upstream/master

export default {
  name: "HomeView",
  components: {
    TopPlaylistNew,
    NewSong,
    HomeInput,
    HomeTabbar,
    HomeNavbar,
<<<<<<< HEAD
    Radio
  },
};
=======
  },
}
</script>

=======
// import HelloWorld from '@/components/HelloWorld.vue'
import HomeSinger from '@/components/home/HomeSinger.vue'
export default {
  name: 'HomeView',
  components: {
    HomeSinger
  }
}
</script>
=======
<template>
<<<<<<< HEAD
  <div class="home">
 
 <HomeRecommond/>
  
=======
  <div>
    <TopNav />
    <SwpierTop />
>>>>>>> upstream/master
  </div>
</template>

<script>
// @ is an alias to /src
<<<<<<< HEAD
import HomeRecommond from '../components/home/HomeRecommond.vue'


=======
import TopNav from "@/components/home/TopNav.vue";
import SwpierTop from "@/components/home/SwpierTop.vue";
>>>>>>> upstream/master
export default {
  components: {
<<<<<<< HEAD
    HomeRecommond,
  }
}
=======
    TopNav,
    SwpierTop,
  },
};
>>>>>>> upstream/master
>>>>>>> upstream/master
</script>
>>>>>>> upstream/master
>>>>>>> upstream/master
